xend: Set up CPUID leaves on restore for both PV and HVM guests.

From: Andrew Thomas <andrew.thomas@oracle.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py
index 553cc0f5bc456fd3d88ba17a31c26ba93f96a979..3952846d4fc74f845a89351deae3f4e710edfe95 100644 (file)
--- a/tools/python/xen/xend/XendCheckpoint.py
+++ b/tools/python/xen/xend/XendCheckpoint.py
@@ -317,8 +317,8 @@ def restore(xd, fd, dominfo = None, paused = False, relocating = False):
                 else:
                     break
             os.close(qemu_fd)
-            restore_image.setCpuid()
 
+        restore_image.setCpuid()
 
         os.read(fd, 1)           # Wait for source to close connection